Feature/cbv best practices