Minor features updates

Minor features updates