[20161219150227] General Enhancements