Added emotions support