Changed naming convention and extended framework.