Added full suport for other cool stuff in order to keep being super duper awesome