Added latest updates which were added during a using SFL in production project