Improvements on skeleton module