Feature/effective props