Fix decimal and new feature