Improved JS base model